From 9a5d4c5b15bf3efd9f3f9875cd2849f222046689 Mon Sep 17 00:00:00 2001 From: justbur Date: Tue, 26 Apr 2016 14:16:08 -0400 Subject: [PATCH] Fix minor issues with god-mode support Make sure advice is activated for god-mode-lookup-command Check for null which-key--god-mode-key-string --- which-key.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/which-key.el b/which-key.el index 1153b072d05..23f71917451 100644 --- a/which-key.el +++ b/which-key.el @@ -523,11 +523,13 @@ so you need to explicitly opt-in for now. Please report any problems at github. If DISABLE is non-nil disable support." (interactive "P") (setq which-key--god-mode-support-enabled (null disable)) + (ad-deactivate 'god-mode-lookup-command) (if disable (ad-disable-advice 'god-mode-lookup-command 'before 'which-key--god-mode-advice) (ad-enable-advice 'god-mode-lookup-command - 'before 'which-key--god-mode-advice))) + 'before 'which-key--god-mode-advice)) + (ad-activate 'god-mode-lookup-command)) ;;;###autoload (define-minor-mode which-key-mode @@ -2085,7 +2087,8 @@ Finally, show the buffer." (when (and which-key--god-mode-support-enabled (bound-and-true-p god-local-mode) (eq this-command 'god-mode-self-insert)) - (setq prefix-keys (kbd which-key--god-mode-key-string))) + (setq prefix-keys (when which-key--god-mode-key-string + (kbd which-key--god-mode-key-string)))) (cond ((and (> (length prefix-keys) 0) (or (keymapp (key-binding prefix-keys)) ;; Some keymaps are stored here like iso-transl-ctl-x-8-map -- 2.30.2